Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Sep 2011 14:14:31 +0000 (07:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Sep 2011 14:14:31 +0000 (07:14 -0700)

Trivial merge